Merge tag 'upstream/0.4.0'
authorAsias He <asias.hejun@gmail.com>
Fri, 5 Apr 2013 02:51:51 +0000 (10:51 +0800)
committerAsias He <asias.hejun@gmail.com>
Fri, 5 Apr 2013 02:51:51 +0000 (10:51 +0800)
Upstream version 0.4.0


Trivial merge